Merge "Revert "Don't remove starting window for visible app." am: 19be6059 am: cf8743b3" into oc-mr1-dev-plus-aosp