Merge "composer: clear vsync source during adb shell stop"