Merge Tablet Homescreen work to gaia-master