Merge "Fix missing KeyguardStatusView after cancelling fps login" into tm-qpr-dev