Merge "Account for padding in KeyguardStatusBarView" into rvc-dev