Merge "draw-wakelock: disable draw wakelock to limit aod animation" into main