Merge "Fix Preference title not grey out when disabled" into tm-dev