Merge change I5dad8b4d

* changes:
  Place shader logging behind prop to declutter logs.