Merge "Adds Assistant Handles learning state to backed up settings"