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

Change-Id: I15f38adb6f88b0ae5ea2e1e936005147a6967092