Merge "Add extra to home settings starting intent." into lmp-dev