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

Change-Id: I557c1b47e960ff2b7715dc71827ac200a21952db