Merge commit 'Prepare v2024.04' into master Bug: 297523929 Change-Id: Ice4ae9ef08e72d3f6c30a66d743e8ead1704475c Signed-off-by: Dmitrii Merkurev <[email protected]>