Merge "Fix usage of obtainMessage()"