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

Change-Id: I2ac88eeed21db2767fbc2a01070d1905a2a74697