Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev