Merge "CE: Remove page flip count"