Merge "Increment Version to 2.3_r4" into gingerbread