[master/f20-branch][PATCH] Prepend the default layout for non-ascii layouts (#1039185)