Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev