Merge "Do not lock when calling startActivityFromRecents" into sc-v2-dev