Merge "Update preferenceSlice layout rule for new volume panel design"