Merge commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad' * commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad': fix[2222341] Soft reset while going back from camcorder settings