Merge "Dismiss the dialog in onDestroy method in PermissionActivity"