Merge "Add HWUI session tagging" into main