Merge "Add a Setting for Wearable System Status Tray Configuration" into main