Merge "Add trunkstable flags for Fold Lock Setting" into main