Merge "Only supports ambient mode when necessary." into qt-dev am: 10a9fde8b5
am: ff687d375c

Change-Id: I77c4c7d91d9356c7e94d658519c9d58a98eaa692