Merge "Avoid null-deref crashes in ScrollBarDrawable"