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

Change-Id: Ie8bb0289451dd520290a47f3ca9af28eec07177c