Merge "Only show 2 buttons in app info screen"