Merge changes I49d32c18,I8e8736fc into tm-dev

* changes:
  Apply temporary PiP decor separately from overall placement
  Debounce TV PiP movements