Merge "Restored style icons and added screen shot icon overlays" into rvc-d1-dev