Merge "Revert "Remove KeyguardHostView"" into tm-qpr-dev