Merge "Added a toolbar in glanceable hub for editing" into main