Merge "update owners for shortcut and launcher related files"