Merge \"Status bar blacklist: fix items resetting\" into nyc-mr1-dev
am: fc27d96bcd

Change-Id: I934f88b5b97a9fb24f1e991af9c11f5fdcf4bd91