Merge "AA+ Final UX spec changes" into sc-dev