Merge "Re-map DisplayAreaAppearedInfo to token-leash map" into sc-dev