Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev