Remove custom providers for screens added purely via xml. Add data keys for those that remain. Change-Id: I28172a1937e40e853f929f3332e3640e63b65141
Remove custom providers for screens added purely via xml. Add data keys for those that remain. Change-Id: I28172a1937e40e853f929f3332e3640e63b65141