Merge "Refactor showToastWhereUidIsRunning to avoid excessive locking" into udc-dev