Merge "StatusBar: Catch OOM caused by third-party icons"