Merge "Add extra flag to ApplicationInfoFlags"