Merge "Improvements to app restriction reason reporting" into main