Merge "Fix dark mode NPE" into qt-dev
am: b9cd46e163

Change-Id: I53c276064189865ff1ac7abc7b22c19df8428dbb