Merge "Fix border bug and filter application - fix layout (use framelayout) -...

Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches