Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce