Merge "Prevent pending G1S interrupt become G0 interrupt" into integration