Merge "Add KeyguardStatusViewController"