Merge "TIF: fix NPE at onHdmiDeviceUpdated()" into lmp-mr1-dev