Merge "Add logging to KeyguardVisibilityHelper" into tm-qpr-dev