Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev