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

Change-Id: I20cfa59d3a6ee46efd29229d771bee358fab8e93