Merge changes Ie7ff2c10,I77920d16,I71ef435c

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