Merge "Update views when next slice is null" into pi-dev
am: 88e264576a

Change-Id: I51146ff0981c0d11df251aff373ffafa5273b80e