Merge "Remove previous code for moving FAB into TL" into ub-gmail-ur14-dev