Revert "Make sure mScrollView is not null when calling layoutItems from content observer."

This reverts commit b41ba831821033c3a821de520a6dd3627f41dd24.
Merge "Revert "Make sure mScrollView is not null when calling layoutItems from content observer."" into jellybean-mr1