Merge "Remove unnecessary view ID" into tm-qpr-dev