Merge the Application Shells into Handheld Compatible UI branch

Just to test if it is working or not more easily.