Merge "Fix recent checkPermission() bug."