Merge "Add the side icon to QS tiles" into main