Merge "Don't remove starting window for visible app." into oc-dr1-dev am: d4b83f96f8
am: 654f917c17

Change-Id: I492ab4b9f28edc65fcd2b60c7d314fe8462437b2