back-port Play Store Fixes