Merge "Fix stuck activity" into oc-mr1-dev
am: ab1760f50f

Change-Id: I47e8c406d4f6bce9b7d6a3ca6fcfd1dfe20174e9