Merge "Fix TaskswitchingDeviceTest." into marshmallow-cts-dev