Merge "Workaround FAB background not being drawn on API 19 DO NOT MERGE ANYWHERE" into nyc-dev