Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev