Merge "Add APP_AUTO_RESTRICTION_ENABLED" into pi-dev