Merge changes I1fa3512b,I47df0cae

* changes:
  Add hw.gpu.enabled hardware property
  Fix a crash when GPU emulation doesn't work.