Merge "Revert "Perform device capability check when checking device aware permission on"" into main