Merge "Fix cutout with temp inset bounds" into pi-dev
am: db704ca8bf

Change-Id: I53a97c7e9a64e583678f61cb12c5329cbf090c37