Merge "Save the click position and restore it on orientation change."