Merge "Split shade status bar: change height to match spec of 42dp" into tm-dev