Merge "Fix incorrect content description on action bar home/up" into klp-dev