Merge "Merge "Make sure to clear outdated screenshot of splitting tasks" into tm-qpr-dev am: 64dd311dec am: f81b7bcd96" into udc-dev