Merge "Do not pause resumed activity in resumeTopActivityUncheckedLocked." into oc-dev