Merge "Rework cut-off decisions in cyclic refresh aq mode"