Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread