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

Change-Id: I9098e7e3bc2169ba4a48608aca0fd8020f707dfa