Merge "Expand notification generates USER_INTERACTION event"