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