Merge "Use feature instead of hidden config for multi-display" into oc-dev am: 72790bade5
am: 2d27f1c538

Change-Id: I2f8c876f53c021e4eca8fb50b4de8f7d5390e673