Merge "Schematize Display system properties" am: db5c59214f
am: e3f4f5eedb

Change-Id: Iae50263941eed58171d9bf8d6cf47ab79362a977