Merge "Support design - fix FloatingActionButton elevation"