Merge "do wom: allow DisplayOffload to block screen turning on" into main