Merge "Dismiss Dialog in post instead of immediately" am: 9b2c026f10
am: 919e151bd3

Change-Id: Id214aaf4e7c7f58429f13a5c32b80149be401fbe