Merge "Set shortcuts alpha when transitioning to/from hub" into main