Further investigate camera api freezes on photos

...also think about including Open Camera by default and removing the AOSP-Camera2 app for now...

This is also an SODP bug, so maybe backport it!