Merge "Fix overlay problem on USB fragment"