Merge "Merge \\"Workaround FAB background not being drawn on API 19 DO NOT MERGE ANYWHERE\\" into nyc-dev am: 3e5e792ce6  -s ours am: fe2fd9a7d6  -s ours" into nyc-mr1-dev-plus-aosp