Merge "Screen on/off event cleanup"