Merge "Remove call to getComponent(StatusBar) from ScreenDecorations."