Merge changes I136e2263,Idb7fd5a9

* changes:
  Don't wait for extra frame when changing configs.
  Fix up reference times for period changes.