Merge "Navigation related wear credential app changes" into main