Merge "FloatingActionButton fixes" into mnc-ub-dev