Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev