Merge "Revert "Revert "Handle package broadcasts before apps do""" into nyc-mr1-dev