Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev