am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from...
am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
* commit 'e1de865c':
Fixed blackscreen when launching crop from menu.