fix merge
[DF-5093] android Splash screen
[DF-5093] update wait timer
merged with development