Merge "Show unlock prompt when user interacts with the hub" into main