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