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

Change-Id: Icda44b95c21c99dc1de794f83bc28995a001c55a