Fixes a bug when layouts are changed since the
layout change animation might set certain view alphas to less than 1.
Merge branch 'master' into scrolling-fix

Conflicts:
	FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java