Merge "Clear idle state of destroyed activity" into main