Fix Camera

Signed-off-by: ayysir <dresadd09691@gmail.com>
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy