Content Aware fill is only able to work on the base layer (no Sample Current and Below or Sample All). Content Aware Fill is default when you make a selection and hit Delete. Content Aware Heal is a beefed up Spot Heal, which is able to Sample All Layers. This way you can use this tool along with the Stamp tool on a dedicated Spot Layer for non destructive retouching.
Also P.S. Mini Bridge isn't talked about as much, but this little panel is going to do wonders for your workflow when working composites with multiple source files.
Content Aware Fill (only works on base layer)
Select > Delete > Content Aware Fill
Select > Delete > Content Aware Fill

Content Aware Heal
New Layer > Spot Heal > Content Aware + Sample All Layers
New Layer > Spot Heal > Content Aware + Sample All Layers
