keep camera upload service alive

when user cancelled selecting library, keep service state as it was before
Merge branch 'lg2' into bak
Merge branch 'bak' into lg2