Merge "Require partially offscreen apps to have 48dp empty space visible." into main