Merge "Don't finish activity on duplicate resume request" into pi-dev