Merge "Split out whether frame callback and tick is scheduled" into oc-dev
am: 756efea145

Change-Id: I73a1585ac7e287afcf2f0d15d9ccedc5627deed0