Merge "Revert "Transition to hub from screen off when applicable."" into main