Merge "Only supports ambient mode when necessary." into qt-dev