Merge "Clean up visibility related flags in ActivityRecord"