Merging with desktop
Shell changes and unmasks for android building

Changes to make configs also, as well as package keywords