Merge "Fix NPE when status bar isn't available" into oc-dev
am: acd2827f3e

Change-Id: I61f18d0904e866e44bb515e7e3220ffb9ce556cb