Merge "DisplayContentTests: Mark and improve flaky test" into pi-dev