Merge "Add unlocked LS => locked AOD transition" into sc-v2-dev