Merge "Center airplane icon in its frame" into pi-dev