Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala