Merge "Multi credential flattened screen changes" into main