Merge "Fix the FAB not returning when animations are disabled" into mnc-ub-dev