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

* commit '5ecac8623018236e9f15385cade2c7ea59829f2e':
  Fix the FAB not returning when animations are disabled

Change-Id: I90e399cbb1becfa3577145535ee5b9048d646efb