Merge "Fix incorrect background bounds set by stackscroll view" into pi-dev
am: 565ea8f348

Change-Id: I22967ce3704c7e2d8a25d6c84cb12fe59326238f