PIE: Restart launcher

Change-Id: I2660e5fed1d6d779f98dba23230b487f72c2ecf6

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java