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