Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev