Merge "Fix display power state reset in vr flinger path"