Merge "Increase size of app info tap target"