Merge "FloatingActionButton border DO NOT MERGE" into lmp-mr1-ub-dev