Merge "Don't apply filter in readback, when there is no scaling" into pi-dev
am: cea247e135

Change-Id: Ibfcc41e052376d159886410d11130bb89ade168d