Merge pull request #629 from google/xsettings

OboeTester: reset configuration between activities