Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev