Merge "Fix application moves."