Merge "init.stingray.rc: Remove firmware timeout hack"