Merge "Don't crash on rotation when cropping a profile picture" into klp-dev