Merge "Add device aware permissions api flag" into main