Merge "Reserve space for preference icon." into oc-dev