Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev