am 957de9a5: (-s ours) am cfba2a22: am 071cfe6c: merge in klp-release (no-op)

am 957de9a5: (-s ours) am cfba2a22: am 071cfe6c: merge in klp-release (no-op)

* commit '957de9a560e24d120dfc76c4b2c1d72581a250fd':
  Only delete the Uri coming from onMediaSaved
  Avoid unnecessary bringChildToFront() calls.
  Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
  Add missing crop message.
  Prevent NPE in gesture handling.
  Restore HQ preference in GCam module.
  Fix memory leak of context in LocalMediaObserver
  Add HQ icon indicator support.
  Remove PopupManager to remove a memory leak
  Make ROI size 1/8 of longer edge of the image
  Sort and select the preview fps range for still image.