Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev am: 544cf7793f
am: 17b995d042

Change-Id: I9300448d8a60399e839dbf20bb5fea5afd7b291b