Merge "overlay: Add defaults for SettingsProvider (enable ALS)" into jb-mr1-dev