Merge "Disable media actions override flag" into tm-dev