Merge "Remove @UnsupportedAppUsage annotation from new dream API" into main