Navigation Bar transparency and Custom Colors (2/2)

Conflicts:

	core/java/android/provider/Settings.java