Merge "Prevent potential NPE when forcing stop package during boot"