Merge "Don't allow both setRelative and setLayer for the same surface." into qt-dev
am: 68b393081e

Change-Id: I219cd24e609d6d47f422c00b4e2cae8677aa7d3d