Merge "Change buffer invalidataion FMQ to unsync"