Merge "Fixed bug w/ ConfirmLock error text flickering" into main