Merge "Update documentation for DISPLAY_DECORATION"