x300: add UHD_IMAGES_DIR to list of directories searched for LVBITX files
Merge branch 'maint'