Merge "Snap docked stack after screen rotation"