Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev