Merge "Fix NullPointerException in System UI caused by remote volume change"