Merge "getDisplayDecorationSupport test: allow errors" into tm-dev