Merge "Some minor fixes for extracted status bar." into ub-launcher3-calgary-polish
am: f0fc3c4674

Change-Id: I965c225ab3ab0062c2176af933e019e77011a745