Merge "Wire up new hideycling ok button to persist setting." into klp-dev