Merge "Device aware permission schema/policy changes" into main