Merge "Some changes to FAB controller pertaining to animations." into lmp-dev