Merge "Rename setUidForeground to noteUidForeground"