Merge "media: Fix image grid control setting for non-HEIC roles" into video-userspace.lnx.7.3.9