Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0