Merge "Start handling CircleImageView resizing on pre API-21"