Merge "[15/n] Improved AppCompat camera classes dependencies" into main