Merge "Remove ActivityRecord#okToShowLocked" into sc-v2-dev