Merge "Store OnOffsetChangeListener with hard refs" into lmp-mr1-ub-dev