Merge "Align Keyguard statusBar margin padding to phone's" into sc-qpr1-dev