Merge "st-hal: fix setting user verification mode"