Merge "Fix NPE in ActivityStack.ensureActivitiesVisibleLocked"