Merge "Update the fingerprint skip dialog" into qt-dev