Merge "project: msm8996: enable fbcon display when verified boot is enabled"