Merge "do: fix flagging logic for cancelBlockScreenOn" into main