Bug #8 fix tile reorder

Change-Id: I7283c7095d94d54be524429a07be3b63ca8d8242
Merge remote-tracking branch 'pa/jellybean' into fjpa