Merge "Leave more buffer for state change between TOP & other state" into pie-cts-dev