Merge "Update boot animation owners"