Merge "Adding icon theming API support in Launcher"