Merge "Do not play sounds when unlocking from AoD." into oc-mr1-dev