Merge "Remove duplicate screenshot view from xml" into rvc-dev