Merge "Fix some issues found in AM display tests"