Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev