Merge "Introduce logout button and DevicePolicyManager API to enable it"