Merge "Enable display name filtering and update the list of device names that are allowed to be logged in external input logging" into main