Merge "Add uievent IDs for QS modes dialog interactions & log them" into main