Merge changes I4df9945c,I5706cb38 into sc-dev

* changes:
  Update device info on Display.getDeviceProductInfo()
  Display API: Do not expose internal locks