Merge "Make sure only the top-most running activity can be active" into rvc-dev am: 3b6ade6a89 am: 7fa8f96411

Change-Id: I49d9c80921041f472a674cc877dd7a883930793b