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