Merge "Gallery2: Adjust the layout of bottom controls of photopage" into android_ui.lnx.1.2-dev