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

Change-Id: I6ab2b6a141f3cd52e9732d8c9965dc1c22c303f5