Merge "Fixed no alert text shown when there is alert"