Merge "Fix FAB shadow on L" into lmp-mr1-ub-dev