Merge "Reset mHiddenSetFromTransferredStartingWindow when app set visibility" into oc-dev