Merge "Schematize Display system properties"
am: db5c59214f

Change-Id: I363f989b8259adccc86c85708e64fcb05222e6fc