Merge "Adding configuration to timeout for "Android is starting message""