Merge "Removed extra layout resources from old photoeditor." into gb-ub-photos-bryce