Merge lastest commit from homescreen-2017

No match.