Properly handle null URIs.

Change-Id: Ib81044686f40284bacf6ee645c671679f62be843
JIRA:CYAN-2491
Remove 'force overflow button' logic.

It's force-enabled now anyway.

Change-Id: Ib4489456d40650316d45865fedfae9c3c960b81e

Conflicts:

	core/java/android/provider/Settings.java