Merge "Overlay icons for overview and work icon" into rvc-dev