Merge "Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: b088f96ef5 am: a83081d783 am: 25ec3fb792" into udc-dev