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

Change-Id: I873f31c2a9c5a2ec2236f4efe6d3259b01963faf