Merge "Update dialog to pass accessibiliity scanner"