Merge "Add sysprop for extra delay for content overlay fade out" into main