Merge "Add compiler filter for inactive app downgrade"