Merge "Split ActivityStack.ensureActivitiesVisibleLocked."