Merge "Skip update-on-boot for bootreason in blacklist"