Merge "Remove legacy calls to StatusBarWindowView for layouts" into sc-v2-dev