Merge "Add Wearable setting for Wrist Detection Auto-Locking" into main