Merge "Use customized event flag for data FMQ not_empty to avoid conflict" into main