Merge "Close the dialog activity before new one is displayed" am: c342bd2223
am: 7851d26a2f

Change-Id: I68c924b703d019aa017580202ca046b2b7549e0c