Merge "Fix issue #123661377: API Review: MODE_FOREGROUND"