Merge "List apps affected by secure user ID" into main