Merge "Let DreamActivity handle all configuration changes"