Merge "Enable logcat for sleep token change" into main