Merge "Removing additional rpc due to icon cache update" into ub-launcher3-master