Merge "Set stealth mode during inflation" into pi-dev