Merge "msm_fb: Fix adb shell start/stop issue when bypass enabled"