Merge "Fix requestLayout-during-layout issue with Gallery"