Merge "In bindAllApplications, only switch to NORMAL while in ALL_APPS" into main