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