Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev