Merge "Ensure shade is collapsed on app launch" into main