Merge "Fixing the weird preview size w/ effects on camera" into jb-dev