Merge "Fix incorrect background bounds set by stackscroll view" into pi-dev