Merge "Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)" into jb-dev