Merge "Add extra dim keywords to aosp settings" into sc-dev