Merge "Center airplane icon in its frame" into pi-dev am: ad9c39d571
am: c4dc4bc6d9

Change-Id: If7762deebe78e589204646ef0cdb72a59a1e8993