Merge "Adds adaptive bitmap support to URI based icons"