Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev