Merge "add display_primary* to sysprop"