Merge "Fix EdgeEffect behavior for RecyclerView" into lmp-mr1-ub-dev