Merge pull request #9777 from askeing/Bug_867031

Bug 867031 - [CustomizeUI] Cannot preload contacts during build time, r=@timdream
Conflicts:

	Makefile
Merge pull request #9916 from askeing/v1.0.1

Merge pull request #9777 from askeing/Bug_867031