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