Merge "Add pixel_continuity to sysprop mapper" into main