Merge "Use fullscreen flag to define visibility of the background am: b60e1c037a am: 41e0c055af" into oc-mr1-dev-plus-aosp