Revert "Revert "For AndroidStaggeredGrid and Test""

This reverts commit 73bbbaef879b1fabe5c6202b6b357f84502d77f6.
Revert "Revert "Revert "For AndroidStaggeredGrid and Test"""

This reverts commit c81434ed7fc7e6a617a1afcda002de5e1f4d415c.