Merge changes Ib786d55e,Ibcda3d72

* changes:
  Only add NonClientDecorView when needed
  Move management of BackdropFrameRenderer to DecorView