Merge "Amend "Fix various flashes when..." CL"