Added device prop override to the recovery to fix some bugs.