Merge "Handle NPE in LocalImageResolver to avoid crashing systemui" into rvc-qpr-dev