Merge "Replace fastUnlockTransition flag with bugfix flag" into main