Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev