Merge "Fixed focus issues related to same callingUID"