Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev