Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev