Merge "Gate toast block and remove warning" into rvc-dev