Merge changes I3e765b8a,I8a64ad96

* changes:
  DO NOT MERGE Disable filtering for BufferLayers which are not scaled
  Check if the buffer is actually being scaled instead of only checking scaling mode