Merge "Fix kotlin nullable errors in app CTS tests" into main