e5f2cfeb22
Also fix bugs related to loading changes in dreams settings. Bug: 5121105 Change-Id: I1527c3100d5219a678dd94ed5393bc478b1a1622