Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev