Merge "Add StaggeredGridLayoutManagerActivity to Support7Demos" into lmp-mr1-ub-dev