Merge "Removing fade in logic during load." into tm-dev