Merge "TIF: Do not build input list for background user" into nyc-dev