Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev