Merge "fix clickable area of FAB on pre-Lollipop devices"