Merge lastest commit from homescreen-2017