Apply recent changes to android to windows store apps