Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev