Merge "Add forceFinishCurrentTransition and hook it up to screen power state." into main