Merge "Use settingslib ActionBarShadowController"