Merge "Fix recursive calls on DC#ensureActivitiesVisible" into rvc-dev am: 37bdfa34a6

Change-Id: If5515ba3ba23c04ef23865220befd8616df81ac4