Merge changes I4cee9ec1,I66eb8ed2

* changes:
  Less ugly hack for the permission page
  Add permission request UX