Merge pull request #8283 from EverythingMe/apps-to-canvas