Merge "Make sure only the top-most running activity can be active" into rvc-dev