Merge "Call ensureActivitiesVisibleLocked when setShowWhenLocked"