Merge "Let certain apps go edge-to-edge by default" into main