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