Merge "IMS: Correctly set preview surface dimensions" into atel.lnx.2.0-dev