Merge "Fix bug 5112702 - switches should have "ON" on the right"