Merge changes from topic "clear-buffer-slots"

* changes:
  Maintain the active buffer when clearing buffer slots
  Clear HWC layer buffer slots by assiging a placeholder buffer