Merge "Reset hidden state of AppToken that was cleared due to starting window" into oc-dev am: a36e3a1320
am: eed78264ed

Change-Id: I15f93756b44d94baeb71fa2ce73f337a92c3d213