Merge "conf_files: kona: Remove 2k and qhd profiles"