Merge "Keep nav button container and back button stable during SUW" into main