Fix activity stack when restarting the screen nail

We were stacking multiple activities, resulting in the need for multiple
destructions (back key events) when killing the camera app

Change-Id: I7ec61c517d25f7e47baf47fcd1696f987631c344
Typo in manifest

From AOSP

Change-Id: I123f7d8a2b30337e6224aba1e0fd6d78a24d5233
Merge "Fix activity stack when restarting the screen nail" into cm-10.1
Gallery: Prevent display "Show on map" menu if no geo view is present

Change-Id: I8520bd227295eaa77fd8d63dbd9b5758dbd7bf01
JIRA: CYAN-2005
Issue: https://jira.cyanogenmod.org/browse/CYAN-2005
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Gallery: Fix logic typo

Change-Id: I340b61d60e5f641e87dfddb94e2e147a15e30891
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Gallery2: Fix showOnMap method

If the context is ProxyLauncher, showOnMap will make crash the Gallery app if
GoogleMaps not exists, because the double call to startActivity.
Just query the intent before call the startActivity method.

Change-Id: I55472640e2073dc17a1e2c1630215328ae5effc7
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Gallery2: Fix show on map typo

Change-Id: Ie67b945f20c93972e090ebda0391f6e40a0c7b8d
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>