Add Image Source Field to choose Location or File

Change-Id: I79546c5c2d10b7d6cefdca084f4f7a13ce2939d5
Fixes: bug #1185671
Merge "Add Image Source Field to choose Location or File"