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

Change-Id: I62f6fdedfd1a70295307eae6d01a15a16b7cbf8c