Merge "Make the permission request dialog's layout robust"