Revert "Revert "Move PIE to buttons""

This reverts commit a00014c78500963b887ed457b1e72f2d05d986fd.

Conflicts:
	res/xml/temasek_navigation_settings.xml