Merge "Pass down uid into requestPermissionDialog"