Merge "Selectively expect device to stay awake on fold" into main