Merge changes Ie77bf1d0,I2a959632

* changes:
  Clean up visibility related flags in WindowToken
  Clean up visibility related flags in ActivityRecord