Merge "Replace screenshots using internal displayToken with new API"