Merge "Destroy fill UI when app dies." into pi-dev