Add butter bar when blocking is suppressed.

Screenshots:
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GTVJkei1GMWpSYXpHRlJPNG1yVHpoLUltWTNZ/view?usp=sharing
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GZGsyRm91anJoT1pHdjFreHhISnR6UXhUcHBV/view?usp=sharing

Bug: 26917087
Change-Id: I83ae16b7d869f342056403e0da41d23b4fc23448
12 files changed