Merge "Add butter bar when blocking is suppressed." into nyc-dev am: 2629bad3f3
am: 3dd0a320cf

* commit '3dd0a320cf10e4936e62783045b9c47731df8c2c':
  Add butter bar when blocking is suppressed.