Merge "Add a flag for Dual Shade" into tm-qpr-dev