Merge "Only derive capture app type if input stream is available" into oc-dr1-dev
am: ea5a81ca4d

Change-Id: I83bc3f142205fd1c6b941b454fa4db7fb7bea27f