Merge pull request #12288 from dwi2/bug911139

Bug 911139 - [Keyboard][V1.2] The currently enabled keyboard should have a check mark, r=timdream