Merge "Reset taskbarModePreference on tearDown()" into main