Jason edits for Mode 2

Added Jason's edits for the remove background functions in the 'take a
photo' mode.  (Still some bugs to work out)