Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev