Merge "Fix edge effect not showing up on first scroll" am: 894d8cf470 am: 391a7c381d am: bc7b84e463
am: 7d3edea9eb

Change-Id: I26189eb151608994f60d349abdc3660e26032b38