Merge "Fix NPE for devices that don't use a lock icon in sysui." into qt-dev