Merge "Reduce number of binder calls by saving nav bar state" into cm-10.1

Change-Id: I9400790f471f13ccf4196e0a1295f4de9d0d529a