Merge "Flagging requirement for notifyDataActivitychanged" into main