Merge "Add flagging for smartspace event swipe logging" into main