Merge "Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev am: 0e9667a356" into qt-dev-plus-aosp