Merge "Add support for seamless transion from/to AoD"