Merge changes I4c122bf5,Ib39200ac

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