Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev