Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev