Merge "Reduce device fallback to just icon" into rvc-dev