Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev