Merge "Fixed flicker on activity transition in docked stack."