Merge "Fix 5323545 - FaceLock no longer appears when taking a call"