Merge "hal: Update app type configuration logic"