Merge "Replace placeholder icons with stylus icons" into udc-dev