Merge "Fix issue #2325621: Runtime restart after launching Android keyboard setting."