Merge "Support base layouts in list preferences" into rvc-dev