Merge "Update homescreen-2017 SRCREV"