Merge "Update FloatingActionButton's elevation handling"