Merge "Workaround FAB background not being drawn on API 19"