Merge "Updates Icon type checks in framework to include TYPE_URI_ADAPTIVE_BITMAP"