Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev