Merge "Fix transition for non-wallpaper activity."