Merge branch 'fix-inconcictency-between-plot-n-scan' into 'master'
flint: Fix inconsistency between previousScan/previousPlot
See merge request !5515 (merged)
(cherry picked from commit 75a13979)
e56cce57 flint: Fix inconsistency between previousScan/previousPlot