Merge "Waiting for Normal state after pressing Esc in AllApps" into main