Merge "Track offset of center child view in Gallery for later layouts" into jb-mr1-dev