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

Change-Id: I6e5eea8b73a96738926040f7e98c74bda8c97068