Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali