Merge "Nested scrolling: android-support-v4 edition" into lmp-mr1-ub-dev