Merge "Fix floating toolbar position issues." into mnc-dev