Merge "Modify test tag on ModeTile to include state" into main