Bug 1085359 - Move secondLayout option handling to render
Merge pull request #25374 from timdream/keyboard-uppercase

Bug 1085359 - Move secondLayout option handling to render, r=mnjul