Merge "Move app overlay permission to app level"