Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev am: d20db5a0bd
am: a45febf1fa

Change-Id: I5f1bfd486c0ab87f8a09ee8b0283faeb5513aa7b