Adding support for loading the default layout from a content provider
am: c0f03d9665

Change-Id: Ifadd6d9997a355cfcbe99b78c34ffcbd6e0051fd