Merge "Make the FAB appear visually correct pre-L" into lmp-mr1-ub-dev