Merge "set tapjacking protection for deviceadmin permission dialog"