Merge "Show/hide FloatingActionButton improvements" into lmp-mr1-ub-dev