Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev