Merge "Gallery2: Remove frame button in photo edit." into android_ui.lnx.1.2-dev