Merge "Remove owner and logout views from KeyguardStatusView" into sc-dev