Merge "More UX updates around picking images." into klp-dev