Merge "Silently ignore force stop API for protected packages" into pi-dev