Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev