Merge "DO NOT MERGE Use KeyguardStateController for #isShowing" into tm-qpr-dev