Merge "Avoid NPE when mExcludedList is null" into jellybean-mr1
Avoid NPE when mExcludedList is null

Patch Set 2:
  Correct logic

Change-Id: Ibaf9ff6996b514284e52a8adcfb5578f9d072eb0
Merge "Make sure mScrollView is not null when calling layoutItems from content observer." into jellybean-mr1
Make sure mScrollView is not null when calling layoutItems from content observer.

Change-Id: I8a23e7d793989ba9df79377f38526ed61a757eba
Merge "Revert "Make sure mScrollView is not null when calling layoutItems from content observer."" into jellybean-mr1
Revert "Make sure mScrollView is not null when calling layoutItems from content observer."

This reverts commit b41ba831821033c3a821de520a6dd3627f41dd24.
Make sure mScrollView is not null when calling layoutItems from content observer.

Change-Id: I34e5be733af3166b3a88150bb5c4574f962be436
Merge "Make sure mScrollView is not null when calling layoutItems from content observer." into jellybean-mr1
Merge commit '715e314ae02701c6b972c70509804c4efa61f5f5' into jellybean-mr1