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

Change-Id: I55ce1ebd406239bcecae1a05e97107e7d9fe80cb