Merge "Update KeyguardStatusBar views w/ display change" into sc-v2-dev