Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43" into oc-mr1-dev