Merge "Floating Action Button" into lmp-mr1-ub-dev