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

Change-Id: I0f896d7e54fbb42378bf6e3b8a622009b17da868