Merge "Smaller buttons for power menu in landscape mode" into main