Merge "Fail staged session if apexd session is in ROLLBACK_IN_PROGRESS state"