Merge "UI changes to permission dialog"