Merge "Early wake-up for transitions (1/2)" into pi-dev