Merge "Reland "Update documentation for DISPLAY_DECORATION""