Merge "Fixing spring animation for fallback launcher activity" into tm-dev